<<<<<<< HEAD
<?phpecho "这是文件1";echo "这是文件2";echo "这是文件3";?>
=======
<?phpecho "这是文件5";echo "这是文件2";echo "这是文件3";?>
>>>>>>> master2
